From: Boyuan Yang Date: Mon, 13 Apr 2020 22:13:39 +0000 (-0400) Subject: debian/patches: Refresh patches X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~162 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=f292820cc982b99bdbed3718c74f6d7791a98b12;p=opencc.git debian/patches: Refresh patches --- diff --git a/debian/patches/0004-data-Explicitly-use-python3.patch b/debian/patches/0004-data-Explicitly-use-python3.patch index 0ce0798..c5d991d 100644 --- a/debian/patches/0004-data-Explicitly-use-python3.patch +++ b/debian/patches/0004-data-Explicitly-use-python3.patch @@ -1,32 +1,18 @@ From: Boyuan Yang -Date: Fri, 30 Aug 2019 13:51:12 -0400 +Date: Mon, 13 Apr 2020 18:18:19 -0400 Subject: data/: Explicitly use python3 Before "python" is default to python3, this patch should be kept. -Last-Update: 2019-08-30 +Last-Update: 2020-04-13 --- - data/CMakeLists.txt | 4 ++-- data/scripts/find_target.py | 2 +- data/scripts/merge.py | 2 +- data/scripts/reverse.py | 2 +- data/scripts/sort.py | 2 +- data/scripts/sort_all.py | 2 +- - 6 files changed, 7 insertions(+), 7 deletions(-) + 5 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 1516775..3989bad 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -1,6 +1,6 @@ - set(OPENCC_DICT_BIN opencc_dict) --set(DICT_MERGE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py) --set(DICT_REVERSE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py) -+set(DICT_MERGE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py) -+set(DICT_REVERSE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py) - set(DICT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dictionary) - set(DICT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR}) - diff --git a/data/scripts/find_target.py b/data/scripts/find_target.py index 28ada27..ffb3704 100755 --- a/data/scripts/find_target.py diff --git a/debian/patches/lib-name-match-soversion.patch b/debian/patches/lib-name-match-soversion.patch index 98e9437..cd3bed4 100644 --- a/debian/patches/lib-name-match-soversion.patch +++ b/debian/patches/lib-name-match-soversion.patch @@ -8,7 +8,7 @@ Subject: make sure library name matches soname 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 498a4f6..6e36db1 100644 +index 234dc85..3e6759a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -75,7 +75,7 @@ set_target_properties( diff --git a/debian/patches/use-cmake-install-libdir.patch b/debian/patches/use-cmake-install-libdir.patch index 3dcdec0..cf3a2ce 100644 --- a/debian/patches/use-cmake-install-libdir.patch +++ b/debian/patches/use-cmake-install-libdir.patch @@ -8,7 +8,7 @@ Subject: use-cmake-install-libdir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a29415..abbac00 100644 +index 5c9ee72..12dd36c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/debian/patches/use-system-libraries.patch b/debian/patches/use-system-libraries.patch index 0d31e5a..7d2825a 100644 --- a/debian/patches/use-system-libraries.patch +++ b/debian/patches/use-system-libraries.patch @@ -8,7 +8,7 @@ Subject: use-system-libraries 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6e36db1..299a062 100644 +index 3e6759a..6b04ad8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,7 @@